Small fixes and changes