some fixes for holy Pyker grace