Fixed wittle bugs