Fixed other common issues