Fixes more issues

Whee.