Fixed some restriction problems