added some previous fixes