Compilation fixes - Code cleaning