Fixes to bkstop