Random fixes for issues I came across accidentally