Fix some more issues

Done.