Some smaller fixes related to previus commit.