[FUN] Sprint 16, fixes to sources

Change-Id: Ie39ace6d6c144929550596de013a8c93464a556a
1 file changed