Minor fixes, changes