Several changes I should had commited long ago