Modifications for compiling