Fixes in 02 & 02s