More placement improvements