Fix some imports and defaults