Bug fixes, files as resource