Pre release fixes

Show. =)