project maintenance fixes