Changed compilation for use with Cloud 9