1. Small fixes