Changes made to resolve bug issues