Multiple fixes

Review commit by commit