Fixes after compiling and testing