Jarv/release fixes