fixes found in production :)