Fixes in previously added code