Fixed Compilation Problems