Fixes some bugs #2