fixes for whereto