Last fixes in 0.4-SNAPSHOT