[[ MERG ]] Fixing compiling issues