Code reviews fixes