Small souce layout fixes