Many temporary fixes to get the client-side working with 0.1.4.