Added missing break
Removed some warnings