Fixes for basic & loops.