Fixed project map handling