Fixes for compile