Fixed all compiler errors