Handle less compilation errors