Bug fixes for no filepath
Fixes