Fixes for file image issues needs file dir parsed