Fixed all reference errors in project