Updates for 0.4.0 celluloid compatibility