Fixing some other issues I found