Fixes for Maxim