Fix some big issues