Fixes on some stuff