Small changes (loading sequence, relative paths)