Dev Sync (9)

Few Fixes.