Random fixes for stupid sh*t