Common changes for ShadowKat