Minor fixes to previous fixes

u_u