Small tiny fixes