Fixed stuff up