Bug fixes in shittyclient