Few more bug fixes after launch