Fixed stuff while testing with Jen