Patched some minor issues.