Initial fixes for compilation...