Random fixes

Feel free to mix and match