targeting 4.4.2 of mmd and fixed warnings