Fixes #310 and #250

Fixes #310 and #250

Damned, pushed too early - now also contains a workaround for #248 - at least for burning rush (can't count the times this nearly got me killed in a boss fight...)