Updated to KickAssembler 3.36 changes