Fixes for failing to layout