Small fixes and suggestions