Updates to remove errors and warnings for xcode