Black Colt and other fixes