Fix two problems after reorganisation