Pre release fixes