AK: Adding some hacks to get back online