Local fix of timscott/catnap#16
Some project file changes