Fixes for types to allow compilation