Fixes based on Julian's feedback