Fixing stuff from merge