Few post-lauch fixes 4