Stupid fixes for misreading spec