Minor errors/bugs fixes.