Fix for paths and stuff