Last fixes for 0.3