Fixes barebones client