Fixes for getting files etc