Fixes in 03.