Last commit fixes