Private branch for me + some fixes for compile