Fixed build of ex1 and ex6