Fixed compilation errors. Reverted some stuff.