Last touches to get everything working under cljs