Few post-lauch fixes 5