Fixes

Made something work I had previously worked around