Bug fixes for hit/stay