Fixing some stuff up from a bad commit