Fixing additional bugs

Getting complex…