Bug fixes, new system dependency