Fixes in c7b21a9