changes to allow compilation again