latest fixes before 2.0

Signed-off-by: Per Jonasson <per@webable.se>