Fixing some old issues

Hello there