Fixes problems introduced in this branch