Small fixes, changes