Some small stuff for future tweaks