Some fixes move fast type inside if statement.