Little fixes2 (GitEye's handles this a somewhat strange)