Minor project fixes