Fixes from testing against 10.3