Minor fixes related to extra files