Fix some imports and configuration