Fixing some stuff so i don't have 7-long method chains