Fixed stuff in odd cases.