General project fixes