Minor fixes, cleaning