Fix paths and check for catalog dir first