Temporary fixes to allow compiling again for testing...