Few ugly fixes