Fixing AWOL mistakes