Fixed all my compilation issues