fixes for complilation