More fixes from alpha3 feedback