Fixing some additional errors after testing