Fix two nice little epic failures