Fixes for use with projects