Fixed Long/Integer issues