Fixes

Fixes for today. Pls Merge and delete.