Some fixes found in my alias code project. The alias still has work left to do, but these bugs fixes can be pushed now