C stuff, probably tweaks