Added some compilation time changes