Bugfixes verified with Silo App