Small fixes and additions