some fixes for after ftplugins