Fix post merge project issues