some tweaks in backend area