Small fixes and ducklings