Attempted fixes

Q1