Some GCW-Zero Tweaks

Just some small tweaks.