WIP: Min issues fixed