Finally fixed the snapshot packaging for good...
Fixed command NPE's on enable due to new systems.