fixes for Kyle