re-Fixed some issues that were not merged manually