3.0 misc

Some minor stuff I encountered.