Fixed 2 issues

Specifically, 64 anbd 41