Fixing some level issues