Before and After annotations
Removed two warnings