Fixes for compilation