Project fixes and minor enhancements