Adding some hacks to get build quickly