Fixing some minor bugs

This is mostly so I can learn how Git works; I just fixed some minor bugs so as to get things to compile and pass tests on Sage 5.6