Fixes: added back some imports badly deleted in previous commit