Problem: Compilation fixes