Whoops
Random fixes from testing