Further stuff fixed