More bug fixing

Fun fun