Buncha fixes