More a tweaks