Adding some fixes to implements