3.0-pre1 update 1

Minor fixes