Removed compile issues, FR