Fixes context related issues
Fixes typo