v412, wrapperClass option and other small bug fixes