Fixes
Pull mort's changes