minor modifications to compile