Fixed L4 warnings