Some crappy fixes