Bug fixes and code review to lwc