Small cleanup and added support for Compass with Foundation