Fixes and static page support