More fixes to this god damn power block