Fix in build
Adjust memory allocations again
 * Things seems more stable now. Camera doesn't crash when
   switching to video after taking pictures.