Layout fixes, early prototype warning