Fixed multi-file stuff