BUGFIXES IN COMPILATION!!!