Fixed Guardian issues