Fixed 2 compilation errors
Fixed 2 compilation errors and merged KeyManager