Fixin some things