Version 4.0.0 RC6

Minor bug fixes