More fixes

BGM-related, mostly.