minor changes to long type generation