Fixes and etc.