Local fixes

Revision:
7:0f12a3d0bd10
Parent:
5:361a6987739b